allow static jasper gdk-pixbuf loader

svn path=/trunk/; revision=22264

diff --git a/ChangeLog b/ChangeLog
index 17fce4d906f96445b7ad4e18c9a526ef8a48cc0e..2caac9b16504c8cf9e290c035f05fd04e686105b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-30  Fridrich Strba  <fridrich.strba@bluewin.ch>
+
+       * configure.in: Allow linking in static jasper gdk-pixbuf loader.
+       (reviewed by Tor Lillqvist)
+
 2009-01-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextview.c (preedit_changed_handler): Be more careful

diff --git a/configure.in b/configure.in
index ebe1a96b7485f839c69b83cfc982328afc689381..6d01129c3b3aedaf38e7771bc38036dee9c260c7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1163,8 +1163,11 @@ if $dynworks ; then
   if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
   fi
+  if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
+    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
+  fi
 else
-  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
+  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
 fi
 
 # Checks to see whether we should include mediaLib